Split desktop file into term and non-term versions

Thanks to Norbert Preining <preining@logic.at> for reporting the
problem.

Closes: 799935

diff --git a/debian/emacsVER-term.desktop b/debian/emacsVER-term.desktop
new file mode 100644 (file)
index 0000000..772d2e8
--- /dev/null
+++ b/debian/emacsVER-term.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Name=GNU Emacs @MENU_VERSION@ (Terminal)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/@DEB_FLAVOR@
+Exec=/usr/bin/@DEB_FLAVOR@ -nw %F
+Icon=@DEB_FLAVOR@
+Type=Application
+Terminal=true
+Categories=Utility;Development;TextEditor;

diff --git a/debian/emacsVER.desktop b/debian/emacsVER.desktop
index cd01e928b0ec5fc38c46a8b05348d410f0de7317..2a0bcd5c841595dd1f2e2f37740a9ee01db76879 100644 (file)
--- a/debian/emacsVER.desktop
+++ b/debian/emacsVER.desktop
@@ -10,16 +10,3 @@ Icon=@DEB_FLAVOR@
 Type=Application
 Terminal=false
 Categories=Utility;Development;TextEditor;
-
-[Desktop Entry]
-Version=1.0
-Name=GNU Emacs @MENU_VERSION@ (Terminal)
-GenericName=Text Editor
-Comment=GNU Emacs is an extensible, customizable text editor - and more
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-TryExec=/usr/bin/@DEB_FLAVOR@
-Exec=/usr/bin/@DEB_FLAVOR@ -nw %F
-Icon=@DEB_FLAVOR@
-Type=Application
-Terminal=true
-Categories=Utility;Development;TextEditor;

diff --git a/debian/rules b/debian/rules
index 2b8b694b35c2e16f98195aa2667cd2a0624ea436..e4b17bb530b2164792bc163c15fbf2876a8da9e3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 
 # Copyright 1994,1995 Ian Jackson
 # Copyright 2004-2005 Jérôme Marant <jerome@debian.org>
-# Copyright 1998-2013 Rob Browning <rlb@defaultvalue.org>
+# Copyright 1998-2015 Rob Browning <rlb@defaultvalue.org>
 
 # Originally copied from the GNU Hello Debian rules file (1.3).
 # Modified for emacs by Mark Eichin <eichin@kitten.gen.ma.us>.
@@ -143,6 +143,7 @@ nonpersistent_autogen_install_files := \
   debian/$(flavor)-common.lintian-overrides \
   debian/$(flavor)-common.postinst \
   debian/$(flavor)-common.prerm \
+  debian/$(flavor)-term.desktop \
   debian/$(flavor)-nox.README.Debian \
   debian/$(flavor)-nox.lintian-overrides \
   debian/$(flavor)-nox.postinst \
@@ -279,6 +280,9 @@ debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog
 debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog
        $(call deb_sub,$<,$@)
 
+debian/$(flavor)-term.desktop: debian/emacsVER-term.desktop debian/changelog
+       $(call deb_sub,$<,$@)
+
 debian/$(flavor)-common.README.Debian: \
   debian/emacsVER-common.README debian/patches/*.patch debian/patches/series \
   debian/rules debian/patch-to-news
@@ -543,10 +547,12 @@ override_dh_auto_install: $(autogen_install_files)
          $(call install_common_binpkg_bits,\
            $(install_dir_x),$(pkgdir_x),$(flavor),x)
 
-          # install desktop entry
+          # install desktop entries
          install -d $(pkgdir_x)/usr/share/applications
          install -m 0644 \
-           debian/$(flavor).desktop $(pkgdir_x)/usr/share/applications/
+           debian/$(flavor).desktop \
+           debian/$(flavor)-term.desktop \
+           $(pkgdir_x)/usr/share/applications/
         endif
 
         ##################################################
@@ -555,6 +561,10 @@ override_dh_auto_install: $(autogen_install_files)
          $(call emacs_inst,build-nox,$(install_dir_nox))
          $(call install_common_binpkg_bits,\
            $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox)
+          # install desktop entry
+         install -d $(pkgdir_x)/usr/share/applications
+         install -m 0644 \
+           debian/$(flavor)-term.desktop $(pkgdir_x)/usr/share/applications/
          rm -rf $(install_dir_nox)
         endif
 
@@ -565,10 +575,11 @@ override_dh_auto_install: $(autogen_install_files)
          $(call install_common_binpkg_bits,\
            $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid)
 
-          # install desktop entry
+          # install desktop entries
          install -d $(pkgdir_lucid)/usr/share/applications
          install -m 0644 \
            debian/$(flavor)-lucid.desktop \
+           debian/$(flavor)-term.desktop \
            $(pkgdir_lucid)/usr/share/applications/
          rm -rf $(install_dir_lucid)
         endif